cell renderer combo: Make final

diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c
index af319ceb698b92646394f59f93dad1d21096333a..766f297e298e87b2a1221bbed0923142ac8f1286 100644 (file)
--- a/gtk/gtkcellrenderercombo.c
+++ b/gtk/gtkcellrenderercombo.c
@@ -48,6 +48,22 @@
  * The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
  */
 
+typedef struct _GtkCellRendererComboPrivate GtkCellRendererComboPrivate;
+typedef struct _GtkCellRendererComboClass   GtkCellRendererComboClass;
+
+struct _GtkCellRendererCombo
+{
+  GtkCellRendererText parent;
+
+  /*< private >*/
+  GtkCellRendererComboPrivate *priv;
+};
+
+struct _GtkCellRendererComboClass
+{
+  GtkCellRendererTextClass parent;
+};
+
 
 struct _GtkCellRendererComboPrivate
 {

diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index fbf958609a2fa5099e40e4018cd08c594d5da590..62cf603497f544de4746018a78dab9ba455e42c0 100644 (file)
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -29,33 +29,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_CELL_RENDERER_COMBO           (gtk_cell_renderer_combo_get_type ())
 #define GTK_CELL_RENDERER_COMBO(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererCombo))
-#define GTK_CELL_RENDERER_COMBO_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererComboClass))
 #define GTK_IS_CELL_RENDERER_COMBO(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_COMBO))
-#define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
-#define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
 
 typedef struct _GtkCellRendererCombo              GtkCellRendererCombo;
-typedef struct _GtkCellRendererComboPrivate       GtkCellRendererComboPrivate;
-typedef struct _GtkCellRendererComboClass         GtkCellRendererComboClass;
-
-struct _GtkCellRendererCombo
-{
-  GtkCellRendererText parent;
-
-  /*< private >*/
-  GtkCellRendererComboPrivate *priv;
-};
-
-struct _GtkCellRendererComboClass
-{
-  GtkCellRendererTextClass parent;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
 GDK_AVAILABLE_IN_ALL
 GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;